Skip to content

Update translations from Weblate #1487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2025
Merged

Update translations from Weblate #1487

merged 1 commit into from
May 21, 2025

Conversation

github-actions[bot]
Copy link

Automated changes by create-pull-request GitHub action

@github-actions github-actions bot force-pushed the update-translations/weblate branch from 16c49e3 to 3c65948 Compare May 5, 2025 10:08
@github-actions github-actions bot force-pushed the update-translations/weblate branch from 3c65948 to fe41b1e Compare May 12, 2025 10:08
@github-actions github-actions bot force-pushed the update-translations/weblate branch from fe41b1e to 2229584 Compare May 21, 2025 16:14
@PIG208 PIG208 force-pushed the update-translations/weblate branch 3 times, most recently from 5f543a7 to 7378411 Compare May 21, 2025 18:08
@PIG208 PIG208 requested a review from chrisbobbe May 21, 2025 19:57
@PIG208 PIG208 added the maintainer review PR ready for review by Zulip maintainers label May 21, 2025
@PIG208 PIG208 force-pushed the update-translations/weblate branch from 7378411 to 5257fc3 Compare May 21, 2025 20:04
@chrisbobbe
Copy link
Collaborator

Seems reasonable! Thanks; LGTM, marking for Greg's review.

@chrisbobbe chrisbobbe requested a review from gnprice May 21, 2025 21:29
@chrisbobbe chrisbobbe assigned gnprice and unassigned chrisbobbe May 21, 2025
@chrisbobbe chrisbobbe added integration review Added by maintainers when PR may be ready for integration and removed maintainer review PR ready for review by Zulip maintainers labels May 21, 2025
This squashes all the pending commits from hosted Weblate that
are not in our GitHub repo.

This also resolves the merge conflicts between the two remotes,
and has `tools/check --fix l10n` rerun.

CZO discussion:
  https://chat.zulip.org/#narrow/channel/58-translation/topic/Weblate.20conflict.20resolution/near/2178307
@gnprice
Copy link
Member

gnprice commented May 21, 2025

Thanks @PIG208 for taking care of this! Looks good. Merging, after setting the Git author field to you using git commit --amend --author=… — the commit message in particular doesn't sound like something the bot would say 🙂

@gnprice gnprice force-pushed the update-translations/weblate branch from 5257fc3 to 63f712a Compare May 21, 2025 23:09
@gnprice gnprice merged commit 63f712a into main May 21, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integration review Added by maintainers when PR may be ready for integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants